Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Fri, 25 Jun 2010 23:19:18 +0000 (23:19 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Fri, 25 Jun 2010 23:19:18 +0000 (23:19 +0000)

Trivial merge